From: Ken Raeburn Date: Tue, 16 Jul 2002 16:37:06 +0000 (+0000) Subject: (FETCH_STRING_CHAR_ADVANCE, FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SBYTES X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~31613 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=295d550a92842da8971d46aee772e8a3062f1838;p=emacs.git (FETCH_STRING_CHAR_ADVANCE, FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SBYTES instead of XSTRING()->size_byte. --- diff --git a/src/charset.h b/src/charset.h index d8d504b8283..c84d33ca89d 100644 --- a/src/charset.h +++ b/src/charset.h @@ -574,7 +574,7 @@ if (1) \ if (STRING_MULTIBYTE (STRING)) \ { \ unsigned char *ptr = SDATA (STRING) + BYTEIDX; \ - int space_left = XSTRING (STRING)->size_byte - BYTEIDX; \ + int space_left = SBYTES (STRING) - BYTEIDX; \ int actual_len; \ \ OUTPUT = STRING_CHAR_AND_LENGTH (ptr, space_left, actual_len); \ @@ -591,7 +591,7 @@ else if (1) \ { \ unsigned char *fetch_string_char_ptr = SDATA (STRING) + BYTEIDX; \ - int fetch_string_char_space_left = XSTRING (STRING)->size_byte - BYTEIDX; \ + int fetch_string_char_space_left = SBYTES (STRING) - BYTEIDX; \ int actual_len; \ \ OUTPUT \